Please ignore this pull request for now. The intention is to test out getting master merged back into #186 before providing confirmation to the original branch owner that they are free to take my merge commit. If not action is taken I'll take the changes forward myself.

Testing done

Submitter checklist

• Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
• Ensure that the pull request title represents the desired changelog entry
• Please describe what you did
• Link to relevant issues in GitHub or Jira
• Link to relevant pull requests, esp. upstream and downstream changes
• Ensure you have provided tests - that demonstrates feature works or fixes the issue